Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 15:27:16 +0000 (08:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 6 Sep 2011 15:27:16 +0000 (08:27 -0700)
commite979b4fb742edadea044917c42f4745e40329a25
tree557538e0a5093921a7ebd59f199f90eadde88a5b
parentafe961bbebc5bdc1548380df03532a70fb78cd08
parenta7e0ff52a3249f7038423e8a61bcb85355236e07
Merge from trunk.
src/ChangeLog